Comment out some stuff that depends on the rest of my patches.

2000-07-25  Havoc Pennington  <hp@redhat.com>

* gtk/testtext.c: Comment out some stuff that depends on the rest
of my patches.

diff --git a/ChangeLog b/ChangeLog
index b19ae7da7e7082342563f9cf6a7fcfabb4a0bc30..834ef6b06afa477251f8827840094da596948c8e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-25  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/testtext.c: Comment out some stuff that depends on the rest
+       of my patches.
+
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkmarshal.list: Add NONE:POINTER,POINTER,INT for the text

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b19ae7da7e7082342563f9cf6a7fcfabb4a0bc30..834ef6b06afa477251f8827840094da596948c8e 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2000-07-25  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/testtext.c: Comment out some stuff that depends on the rest
+       of my patches.
+
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkmarshal.list: Add NONE:POINTER,POINTER,INT for the text

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b19ae7da7e7082342563f9cf6a7fcfabb4a0bc30..834ef6b06afa477251f8827840094da596948c8e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2000-07-25  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/testtext.c: Comment out some stuff that depends on the rest
+       of my patches.
+
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkmarshal.list: Add NONE:POINTER,POINTER,INT for the text

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b19ae7da7e7082342563f9cf6a7fcfabb4a0bc30..834ef6b06afa477251f8827840094da596948c8e 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2000-07-25  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/testtext.c: Comment out some stuff that depends on the rest
+       of my patches.
+
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkmarshal.list: Add NONE:POINTER,POINTER,INT for the text

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b19ae7da7e7082342563f9cf6a7fcfabb4a0bc30..834ef6b06afa477251f8827840094da596948c8e 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2000-07-25  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/testtext.c: Comment out some stuff that depends on the rest
+       of my patches.
+
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkmarshal.list: Add NONE:POINTER,POINTER,INT for the text

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b19ae7da7e7082342563f9cf6a7fcfabb4a0bc30..834ef6b06afa477251f8827840094da596948c8e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2000-07-25  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/testtext.c: Comment out some stuff that depends on the rest
+       of my patches.
+
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkmarshal.list: Add NONE:POINTER,POINTER,INT for the text

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b19ae7da7e7082342563f9cf6a7fcfabb4a0bc30..834ef6b06afa477251f8827840094da596948c8e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2000-07-25  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/testtext.c: Comment out some stuff that depends on the rest
+       of my patches.
+
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkmarshal.list: Add NONE:POINTER,POINTER,INT for the text

diff --git a/gtk/testtext.c b/gtk/testtext.c
index bbff4d00aeddde7bf1816d8facde2807ee78bb31..9a6059790a759099feed9094667daca5d0915a22 100644 (file)
--- a/gtk/testtext.c
+++ b/gtk/testtext.c
@@ -930,6 +930,8 @@ do_search (gpointer callback_data,
   GtkWidget *dialog;
   GtkWidget *search_text;
   GtkTextBuffer *buffer;
+
+#if 0
   
   dialog = gtk_dialog_new_with_buttons ("Search",
                                         GTK_WINDOW (view->window),
@@ -958,6 +960,7 @@ do_search (gpointer callback_data,
   gtk_widget_grab_focus (search_text);
   
   gtk_widget_show_all (dialog);
+#endif
 }
 
 static void
@@ -1288,7 +1291,8 @@ buffer_search_forward (Buffer *buffer, const char *str,
           ++i;
         }
     }
-  
+
+#if 0  
   dialog = gtk_message_dialog_new (GTK_WINDOW (view->window),
                                    GTK_MESSAGE_INFO,
                                    GTK_BUTTONS_OK,
@@ -1302,6 +1306,7 @@ buffer_search_forward (Buffer *buffer, const char *str,
                              GTK_OBJECT (dialog));
   
   gtk_widget_show (dialog);
+#endif
 }
 
 static void

diff --git a/tests/testtext.c b/tests/testtext.c
index bbff4d00aeddde7bf1816d8facde2807ee78bb31..9a6059790a759099feed9094667daca5d0915a22 100644 (file)
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -930,6 +930,8 @@ do_search (gpointer callback_data,
   GtkWidget *dialog;
   GtkWidget *search_text;
   GtkTextBuffer *buffer;
+
+#if 0
   
   dialog = gtk_dialog_new_with_buttons ("Search",
                                         GTK_WINDOW (view->window),
@@ -958,6 +960,7 @@ do_search (gpointer callback_data,
   gtk_widget_grab_focus (search_text);
   
   gtk_widget_show_all (dialog);
+#endif
 }
 
 static void
@@ -1288,7 +1291,8 @@ buffer_search_forward (Buffer *buffer, const char *str,
           ++i;
         }
     }
-  
+
+#if 0  
   dialog = gtk_message_dialog_new (GTK_WINDOW (view->window),
                                    GTK_MESSAGE_INFO,
                                    GTK_BUTTONS_OK,
@@ -1302,6 +1306,7 @@ buffer_search_forward (Buffer *buffer, const char *str,
                              GTK_OBJECT (dialog));
   
   gtk_widget_show (dialog);
+#endif
 }
 
 static void